Store ditto image in CVS instead of "real" *.app for Mac. Tweak dmg to know this...

diff --git a/Makefile.in b/Makefile.in
index 82b9bde8a3a74501e4c19ff0c683be87f443d296..31123622fad7e8582bcdbcf4d124257c9b6e9089 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -10,7 +10,7 @@ VERSIOND=$(VERSD)$(RELEASE)
 VERSIONU=$(VERSU)$(RELEASE)
 
 DOCVERSION=@DOCVERSION@
-# DOCVERSION=development
+DOCVERSION=development
 
 CC=@CC@
 EXEEXT=@EXEEXT@

diff --git a/configure b/configure
index a191df8ea9b2f5ceb14c856fa543e19441f5c423..546aab04564fc16fb03f3c7a58ed9f331450e781 100755 (executable)
--- a/configure
+++ b/configure
@@ -1744,9 +1744,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # Increase GBBUILD for a new release
-GBBUILD=17
+GBBUILD=18
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20080821"
+PACKAGE_RELEASE="-beta20080921"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"

diff --git a/configure.in b/configure.in
index f4f532bf9536924016651d006552f3d587fe178a..efcaee44c50ed7c449379e72918101158112f246 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,9 +5,9 @@ AC_PREREQ(2.59)
 
 AC_INIT(GPSBabel, 1.3.6, BUG-REPORT-ADDRESS)
 # Increase GBBUILD for a new release
-GBBUILD=17
+GBBUILD=18
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20080821"
+PACKAGE_RELEASE="-beta20080921"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 

diff --git a/gbversion.h b/gbversion.h
index 09cbfdb89ac36c3959008b48a389603d0be5ed90..d6da868de50f9806604973e34cc5e01f6e4c1a2e 100644 (file)
--- a/gbversion.h
+++ b/gbversion.h
@@ -4,5 +4,5 @@
  *
  * Isn't simplification via automation grand?
  */
-#define VERSION "1.3.6-beta20080821"
+#define VERSION "1.3.6-beta20080921"
 #define WEB_DOC_DIR "http://www.gpsbabel.org/htmldoc-development"

diff --git a/mac/dmg-contents/GPSBabel+.app.dittoed b/mac/dmg-contents/GPSBabel+.app.dittoed
new file mode 100644 (file)
index 0000000..8039d02
Binary files /dev/null and b/mac/dmg-contents/GPSBabel+.app.dittoed differ

diff --git a/tools/mkdmg b/tools/mkdmg
index 19581abbcd07089aade66666a895e9e12f2da404..695de9e36a064c349ad9ce9f3e86ba374fb81f80 100755 (executable)
--- a/tools/mkdmg
+++ b/tools/mkdmg
@@ -29,6 +29,17 @@ makedmg() {
   hdiutil create ${QUIET} -srcfolder mac/dmg-contents -scrub -size 15m ${UDMG} -format UDRW -volname ${NAME}
   hdiutil  attach ${QUIET} ${UDMG} -noautoopen -mountpoint ${WORKDIR}
 
+  # Since CVS loses the resource forkes, we've stored a ditto image in the 
+  # repository.  Unwind that now and turn the *.app back into a "real" 
+  # executable.
+  (
+    cd ${WORKDIR}
+    bzcat GPSBabel+.app.dittoed | cpio -ivd
+    rm GPSBabel+.app.dittoed
+    # Clean this out of taste.
+    rm -fr CVS
+  )
+
   # Copy in the new executable.
   cp -p ./gpsbabel ${WORKDIR}
   hdiutil detach ${QUIET} ${WORKDIR}